[WIP] Pervasive replacement of nkRecWhen in generic types #8748
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hrm, OK, but we could also have changed the definition of |
LemonBoy
force-pushed
the
when-in-objects
branch
from
b6b3a22 to
bd947e0
Compare
LemonBoy
changed the title
LemonBoy
force-pushed
the
when-in-objects
branch
from
bd947e0 to
bb8dfe5
Compare
Araq
reviewed
Oct 14, 2018
compiler/semtypinst.nim
Outdated
| @@ -185,6 +218,11 @@ proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = | |||
| for i in countup(0, sonsLen(n) - 1): | |||
| var it = n.sons[i] | |||
| if it == nil: illFormedAst(n, cl.c.config) | |||
| if mdbg: | |||
Araq
reviewed
Oct 14, 2018
compiler/semtypinst.nim
Outdated
| @@ -198,6 +236,9 @@ proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = | |||
| if branch == nil: branch = it.sons[0] | |||
| else: illFormedAst(n, cl.c.config) | |||
| if branch != nil: | |||
| if mdbg: | |||
Araq
reviewed
Oct 18, 2018
compiler/semtypinst.nim
Outdated
| var branch: PNode = nil # the branch to take | ||
| for i in countup(0, sonsLen(n) - 1): | ||
| var it = n.sons[i] | ||
| if mdbg: |
Long story short, even if the type contains no reference at all to its generic parameters we still have to walk its AST and evaluate any nkRecWhen nodes that semRecordNodeAux skipped due to the type being a generic one. We also must be careful to modify the type `n` node in place since it may be referenced by the caller as seen in the tillegaltyperecursion test. Moreover we also can't have the nkSym drift away from their original values in order not to break the JS nkObjConstr codegen.
LemonBoy
force-pushed
the
when-in-objects
branch
from
bb8dfe5 to
5afcd09
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Long story short, even if the type contains no reference at all to its
generic parameters we still have to walk its AST and evaluate any
nkRecWhen nodes that semRecordNodeAux skipped due to the type being a
generic one.
We also must be careful to modify the type
nnode in place since itmay be referenced by the caller as seen in the tillegaltyperecursion
test.
I found this to be the nicest solution to the problem, we can't perform this resolution before the type is fully constructed as some
whenstatements may refer to generic parameters and performing yet another (it'd be the third) pass over the type in order to resolve the remainingnkRecWhenis not that nice performance-wise.This fixes #8417 and half of #7378.